Refactoring to use React Apollo Query Component